refactor(dev-env): let dev-tools handle their volumes
#2139
+27
−51
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.OpenSSF Scorecard
Scanned Files |
sjinks
force-pushed
the
dev-env-volume-fun
branch
2 times, most recently
from
03ff85d to
5830fcf
Compare
sjinks
commented
Dec 5, 2024
| @@ -31,6 +30,7 @@ services: | |||
| devtools: {} | |||
| scripts: | |||
| initOnly: true | |||
| entrypoint: sh -c 'test -d /dev-tools-orig && /usr/bin/rsync -a --delete /dev-tools-orig/ /dev-tools/ || true' | |||
There was a problem hiding this comment.
Backward compatibility :-(
sjinks
changed the title
dev-tools handle their volumedev-tools handle their volumes
|
I've tested both for a) existing environment and b) fresh env under Mac OS X
Manual start of nginx container after that works. |
|
Updated service dependencies. |
7 tasks
sjinks
force-pushed
the
dev-env-volume-fun
branch
from
e36383f to
6d13d47
Compare
sjinks
force-pushed
the
dev-env-volume-fun
branch
from
6d13d47 to
f77bded
Compare
|
|
Tested, works! |
rinatkhaziev
approved these changes
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR updates the dev-env code to avoid messing with the
dev-toolsvolume.dev-toolsvolumes;phpservice starts afterdevtoolscompletes to avoid race conditions;/dev-tools-origwith/dev-tools. This step is necessary because Lando sets its own entrypoint script if we don't provide ours.Related PR: Automattic/vip-container-images#985 (must be merged before this one)
Volume removal logic was introduced in #1317.
Pull request checklist
New release checklist
Steps to Test
/devtoolsvip-container-images#985,cd dev-tools && docker build -t dev-tools:localnpm run build && npm link~/.local/share/vip/dev-environment/vip-local/.lando.local.yml:vip dev-env startand ensure everything worksvip dev-env shell -- sh -c 'md5sum /dev-tools/*'and save the output.docker build -t dev-tools:local)vip dev-env start).vip dev-env shell -- sh -c 'md5sum /dev-tools/*'and compare the output with the one from step 6. The hash for the updated script must differ.